diff --git a/pom.xml b/pom.xml
index e87ee15..8b718a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <groupId>com.notnoop.mpns</groupId>
   <artifactId>mpns</artifactId>
   <name>Java Microsoft Push Notification Service Library</name>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>0.0.2</version>
 
     <!-- Inherit the Sonatype OSS deployment configuration -->
     <!--
diff --git a/src/main/java/com/notnoop/mpns/MpnsNotification.java b/src/main/java/com/notnoop/mpns/MpnsNotification.java
index 630b165..2f08e38 100644
--- a/src/main/java/com/notnoop/mpns/MpnsNotification.java
+++ b/src/main/java/com/notnoop/mpns/MpnsNotification.java
@@ -51,5 +51,5 @@ public interface MpnsNotification {
      * @return the notification identifier
      */
     public List<? extends Entry<String, String>> getHttpHeaders();
-
+    
 }
diff --git a/src/main/java/com/notnoop/mpns/MpnsNotificationBuilder.java b/src/main/java/com/notnoop/mpns/MpnsNotificationBuilder.java
index 3d4c23e..7d39399 100644
--- a/src/main/java/com/notnoop/mpns/MpnsNotificationBuilder.java
+++ b/src/main/java/com/notnoop/mpns/MpnsNotificationBuilder.java
@@ -30,6 +30,9 @@
  */
 package com.notnoop.mpns;
 
+import com.notnoop.mpns.notifications.CycleTileNotification;
+import com.notnoop.mpns.notifications.FlipTileNotification;
+import com.notnoop.mpns.notifications.IconicTileNotification;
 import com.notnoop.mpns.notifications.RawNotification;
 import com.notnoop.mpns.notifications.TileNotification;
 import com.notnoop.mpns.notifications.ToastNotification;
@@ -52,6 +55,27 @@ public MpnsNotificationBuilder() {}
     public TileNotification.Builder tile() {
         return new TileNotification.Builder();
     }
+    
+    /**
+     * Windows 8: Flip Tile
+     */
+    public FlipTileNotification.Builder flipTile() {
+    	return new FlipTileNotification.Builder();
+    }
+    
+    /**
+     * Windows 8: Iconic Tile
+     */
+    public IconicTileNotification.Builder iconicTile() {
+    	return new IconicTileNotification.Builder();
+    }
+    
+    /**
+     * Windows 8: Cycle Tile
+     */
+    public CycleTileNotification.Builder cycleTile() {
+    	return new CycleTileNotification.Builder();
+    }
 
     /**
      * Sets the notification type to a Toast notification
diff --git a/src/main/java/com/notnoop/mpns/MpnsService.java b/src/main/java/com/notnoop/mpns/MpnsService.java
index a210f48..e1f0793 100644
--- a/src/main/java/com/notnoop/mpns/MpnsService.java
+++ b/src/main/java/com/notnoop/mpns/MpnsService.java
@@ -72,7 +72,7 @@ void push(String subscriptionUri, String payload,
      */
     void push(String subscriptionUri, MpnsNotification message)
         throws NetworkIOException;
-
+    
     /**
      * Starts the service.
      *
diff --git a/src/main/java/com/notnoop/mpns/MpnsServiceBuilder.java b/src/main/java/com/notnoop/mpns/MpnsServiceBuilder.java
index bc98684..8d5c789 100644
--- a/src/main/java/com/notnoop/mpns/MpnsServiceBuilder.java
+++ b/src/main/java/com/notnoop/mpns/MpnsServiceBuilder.java
@@ -30,12 +30,27 @@
  */
 package com.notnoop.mpns;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+import java.util.Arrays;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+
 import org.apache.http.HttpHost;
 import org.apache.http.client.HttpClient;
 import org.apache.http.conn.params.ConnRoutePNames;
+import org.apache.http.conn.scheme.Scheme;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
@@ -67,6 +82,42 @@ public class MpnsServiceBuilder {
     private int timeout = -1;
 
     private MpnsDelegate delegate;
+    
+    // Authenticated calls
+    private SecurityInfo securityInfo;
+    
+    public static class SecurityInfo {
+    	private byte[] cert;
+    	private String password;
+    	private String name;
+    	private String provider;
+    	
+    	public SecurityInfo(byte[] cert, String password, String securityName, String securityProvider) {
+    		if( cert == null || cert.length == 0 ||
+    				password == null || "".equals(password.trim()) ||
+    				securityName == null || "".equals(securityName.trim()) ) {
+    			// provider is optional
+    			throw new IllegalArgumentException("Please provide certificate, password, and name");
+    		}
+    		this.cert = Arrays.copyOf(cert, cert.length);
+    		this.password = password;
+    		this.name = securityName;
+    		this.provider = securityProvider;
+    	}
+    	
+    	public byte[] getCert() {
+    		return cert;
+    	}
+    	public String getPassword() {
+    		return password;
+    	}
+    	public String getName() {
+    		return name;
+    	}
+    	public String getProvider() {
+    		return provider;
+    	}
+    }
 
     /**
      * Constructs a new instance of {@code MpnsServiceBuilder}
@@ -151,6 +202,14 @@ public MpnsServiceBuilder asQueued() {
         this.isQueued = true;
         return this;
     }
+    
+    /**
+     * Authenticated
+     */
+    public MpnsServiceBuilder asAuthenticated(SecurityInfo securityInfo) {
+    	this.securityInfo = securityInfo;
+    	return this;
+    }
 
     /**
      * Sets the timeout for the connection
@@ -190,6 +249,33 @@ public MpnsService build() {
         if (proxy != null) {
             client.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
         }
+        
+        if( securityInfo != null ) {
+        	try {
+	        	KeyStore keyStore = null;
+	        	if( securityInfo.getProvider() == null ) {
+	        		keyStore = KeyStore.getInstance(securityInfo.getName());
+	        	} else {
+	        		keyStore = KeyStore.getInstance(securityInfo.getName(), securityInfo.getProvider());
+	        	}
+	        	keyStore.load(new ByteArrayInputStream(securityInfo.getCert()),
+	        			securityInfo.getPassword().toCharArray());
+	        				
+	        	KeyManagerFactory kmfactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+	        	kmfactory.init(keyStore, securityInfo.getPassword().toCharArray());
+	        	KeyManager[] km = kmfactory.getKeyManagers();
+	
+	        	// create SSL socket factory
+	        	SSLContext sslContext = SSLContext.getInstance("TLS");
+	        	sslContext.init(km, null, null);
+	        	org.apache.http.conn.ssl.SSLSocketFactory sslSocketFactory = new org.apache.http.conn.ssl.SSLSocketFactory(sslContext);
+	     
+	        	Scheme https = new Scheme("https", 443, sslSocketFactory);
+	        	client.getConnectionManager().getSchemeRegistry().register(https);
+        	} catch( Exception e ) {
+        		throw new IllegalArgumentException(e);
+        	}
+        }
 
         if (timeout > 0) {
             HttpParams params = client.getParams();
diff --git a/src/main/java/com/notnoop/mpns/internal/Utilities.java b/src/main/java/com/notnoop/mpns/internal/Utilities.java
index 4a73934..9dd54c7 100644
--- a/src/main/java/com/notnoop/mpns/internal/Utilities.java
+++ b/src/main/java/com/notnoop/mpns/internal/Utilities.java
@@ -30,19 +30,17 @@
 */
 package com.notnoop.mpns.internal;
 
+import java.io.UnsupportedEncodingException;
+
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
 
+import com.notnoop.mpns.DeliveryClass;
 import com.notnoop.mpns.MpnsDelegate;
 import com.notnoop.mpns.MpnsNotification;
 import com.notnoop.mpns.MpnsResponse;
 
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.UnsupportedEncodingException;
-
 public final class Utilities {
     private Utilities() { throw new AssertionError("Uninstantiable class"); }
 
@@ -66,6 +64,29 @@ public static ThreadSafeClientConnManager poolManager(int maxConnections) {
     public static String ifNonNull(Object cond, String value) {
         return cond != null ? value : "";
     }
+    
+    public static String xmlElement(String name, String content) {
+    	return xmlElement(name, content, false);
+    }
+    
+    public static String xmlElementClear(String name, String content) {
+    	return xmlElement(name, content, true);
+    }
+    
+    private static String xmlElement(String name, String content, boolean isClear) {
+    	if( content == null || "".equals(content.trim())) {
+    		return "";
+    	}
+    	StringBuilder sb = new StringBuilder(500);
+    	sb.append("<wp:").append(name);
+    	if( isClear ) {
+    		sb.append(" Action=\"Clear\"");
+    	}
+		sb.append(">");
+    	sb.append(escapeXml(content));
+    	sb.append("</wp:").append(name).append(">");
+    	return sb.toString();
+    }
 
     public static String escapeXml(String value) {
         if (value == null) {
@@ -115,7 +136,7 @@ public static MpnsResponse logicalResponseFor(HttpResponse response) {
             }
 
             if (r.getDeviceConnectionStatus() != null
-                && !r.getNotificationStatus().equals(headerValue(response, "X-DeviceConnectionStatus"))) {
+                && !r.getDeviceConnectionStatus().equals(headerValue(response, "X-DeviceConnectionStatus"))) {
                 continue;
             }
 
@@ -143,4 +164,16 @@ public static void fireDelegate(MpnsNotification message, HttpResponse response,
             }
         }
     }
+    
+    public static int getTileDelivery(DeliveryClass delivery) {
+    	if( delivery == null ) {
+    		delivery = DeliveryClass.IMMEDIATELY;
+    	}
+        switch (delivery) {
+        case IMMEDIATELY:   return 1;
+        case WITHIN_450:    return 11;
+        case WITHIN_900:    return 21;
+        default:            return 1; // IMMEDIATELY is the default
+        }
+    }
 }
diff --git a/src/main/java/com/notnoop/mpns/notifications/CycleTileNotification.java b/src/main/java/com/notnoop/mpns/notifications/CycleTileNotification.java
new file mode 100644
index 0000000..6041101
--- /dev/null
+++ b/src/main/java/com/notnoop/mpns/notifications/CycleTileNotification.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2011, Mahmood Ali.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above
+ *     copyright notice, this list of conditions and the following disclaimer
+ *     in the documentation and/or other materials provided with the
+ *     distribution.
+ *   * Neither the name of Mahmood Ali. nor the names of its
+ *     contributors may be used to endorse or promote products derived from
+ *     this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * Contributed by vhong
+ */
+package com.notnoop.mpns.notifications;
+
+import static com.notnoop.mpns.internal.Utilities.xmlElement;
+import static com.notnoop.mpns.internal.Utilities.xmlElementClear;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map.Entry;
+
+import com.notnoop.mpns.DeliveryClass;
+import com.notnoop.mpns.MpnsNotification;
+import com.notnoop.mpns.internal.Utilities;
+
+public class CycleTileNotification implements MpnsNotification {
+	
+	private final Builder builder;
+	
+    private final List<? extends Entry<String, String>> headers;
+
+    protected CycleTileNotification(Builder builder, List<? extends Entry<String, String>> headers) {
+    	this.builder = builder;
+    	this.headers = headers;
+    }
+
+    public byte[] getRequestBody() {
+    	return this.builder.toByteArray();
+    }
+
+    public List<? extends Entry<String, String>> getHttpHeaders() {
+        return Collections.unmodifiableList(this.headers);
+    }
+
+    public static class Builder extends AbstractNotificationBuilder<Builder, CycleTileNotification> {
+        
+        private String tileId;
+        
+        private boolean isClear;
+        
+        private String smallBackgroundImage;
+        private String[] cycleImages;
+        private int count;
+        private String title;
+        
+        public static final int MAX_IMAGES = 9;
+
+        public Builder() {
+            super("token");
+            contentType(Utilities.XML_CONTENT_TYPE);
+            cycleImages = new String[MAX_IMAGES];
+        }
+        
+        public Builder tileId(String tileId) {
+        	this.tileId = tileId;
+        	return this;
+        }
+        
+        public Builder isClear(boolean clear) {
+        	this.isClear = clear;
+        	return this;
+        }
+        
+        public Builder smallBackgroundImage(String smallBackgroundImage) {
+        	this.smallBackgroundImage = smallBackgroundImage;
+        	return this;
+        }
+        
+        public Builder cycleImage(int index, String imageName) {
+        	if( index >= MAX_IMAGES ) {
+        		throw new IllegalArgumentException("index " + index + " is greater than maximum allowed cycle images of " + MAX_IMAGES);
+        	}
+        	cycleImages[index] = imageName;
+        	return this;
+        }
+
+        public Builder count(int count) {
+            this.count = count;
+            return this;
+        }
+
+        public Builder title(String title) {
+            this.title = title;
+            return this;
+        }
+
+        @Override
+        protected int deliveryValueOf(DeliveryClass delivery) {
+            return Utilities.getTileDelivery(delivery);
+        }
+
+        @Override
+        public CycleTileNotification build() {
+            return new CycleTileNotification(this, this.headers);
+        }
+        
+        protected byte[] toByteArray() {
+            StringBuilder sb = new StringBuilder();
+            sb.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
+            sb.append("<wp:Notification xmlns:wp=\"WPNotification\">");
+            sb.append("<wp:Tile");
+            if( tileId != null ) {
+                sb.append(" Id=\"");
+                sb.append(tileId);
+                sb.append("\"");
+            }
+            sb.append(" Template=\"CycleTile\">");
+            if( isClear ) {
+            	sb.append(xmlElementClear("SmallBackgroundImage", smallBackgroundImage));
+            } else {
+            	sb.append(xmlElement("SmallBackgroundImage", smallBackgroundImage));
+            }
+            for( int i = 0; i < MAX_IMAGES; i++ ) {
+            	if( cycleImages[i] != null ) {
+                    sb.append(xmlElementClear("CycleImage"+(i+1), cycleImages[i]));
+            	}
+            }
+            sb.append(xmlElementClear("Count", ""+count));
+            sb.append(xmlElementClear("Title", title));
+            sb.append("</wp:Tile>");
+            sb.append("</wp:Notification>");
+
+            return Utilities.toUTF8(sb.toString());
+        }
+    }
+}
+
diff --git a/src/main/java/com/notnoop/mpns/notifications/FlipTileNotification.java b/src/main/java/com/notnoop/mpns/notifications/FlipTileNotification.java
new file mode 100644
index 0000000..92fa73c
--- /dev/null
+++ b/src/main/java/com/notnoop/mpns/notifications/FlipTileNotification.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright 2011, Mahmood Ali.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above
+ *     copyright notice, this list of conditions and the following disclaimer
+ *     in the documentation and/or other materials provided with the
+ *     distribution.
+ *   * Neither the name of Mahmood Ali. nor the names of its
+ *     contributors may be used to endorse or promote products derived from
+ *     this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * Contributed by vhong
+ */
+package com.notnoop.mpns.notifications;
+
+import static com.notnoop.mpns.internal.Utilities.xmlElement;
+import static com.notnoop.mpns.internal.Utilities.xmlElementClear;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map.Entry;
+
+import com.notnoop.mpns.DeliveryClass;
+import com.notnoop.mpns.MpnsNotification;
+import com.notnoop.mpns.internal.Utilities;
+
+public class FlipTileNotification implements MpnsNotification {
+	
+	private final Builder builder;
+	
+    private final List<? extends Entry<String, String>> headers;
+
+    public FlipTileNotification(Builder builder, List<? extends Entry<String, String>> headers) {
+    	this.builder = builder;
+    	this.headers = headers;
+    }
+
+    public byte[] getRequestBody() {
+    	return this.builder.toByteArray();
+    }
+
+    public List<? extends Entry<String, String>> getHttpHeaders() {
+        return Collections.unmodifiableList(this.headers);
+    }
+
+    public static class Builder extends AbstractNotificationBuilder<Builder, FlipTileNotification> {
+        
+        private String backgroundImage, title, backBackgroundImage, backTitle, backContent;
+        private int count;
+
+    	private String smallBackgroundImage;
+    	private String wideBackgroundImage;
+    	private String wideBackBackgroundImage;
+    	private String wideBackContent;
+    	private String tileId;
+    	private boolean isClear;
+
+        public Builder() {
+            super("token");
+            contentType(Utilities.XML_CONTENT_TYPE);
+        }
+        
+        public Builder tileId(String tileId) {
+        	this.tileId = tileId;
+        	return this;
+        }
+        
+        public Builder isClear(boolean clear) {
+        	this.isClear = clear;
+        	return this;
+        }
+
+        public Builder backgroundImage(String backgroundImage) {
+            this.backgroundImage = backgroundImage;
+            return this;
+        }
+
+        public Builder title(String title) {
+            this.title = title;
+            return this;
+        }
+
+        public Builder backBackgroundImage(String backBackgroundImage) {
+            this.backBackgroundImage = backBackgroundImage;
+            return this;
+        }
+
+        public Builder backTitle(String backTitle) {
+            this.backTitle = backTitle;
+            return this;
+        }
+
+        public Builder backContent(String backContent) {
+            this.backContent = backContent;
+            return this;
+        }
+
+        public Builder count(int count) {
+            this.count = count;
+            return this;
+        }
+        
+        public Builder smallBackgroundImage(String smallBackgroundImage) {
+        	this.smallBackgroundImage = smallBackgroundImage;
+        	return this;
+        }
+
+    	public Builder wideBackgroundImage( String wideBackgroundImage ) {
+            this.wideBackgroundImage = wideBackgroundImage;
+            return this;
+        }
+
+    	public Builder wideBackBackgroundImage( String wideBackBackgroundImage ) {
+            this.wideBackBackgroundImage = wideBackBackgroundImage;
+            return this;
+        }
+
+        public Builder wideBackContent( String wideBackContent ) {
+            this.wideBackContent = wideBackContent;
+            return this;
+        }
+
+        @Override
+        protected int deliveryValueOf(DeliveryClass delivery) {
+            return Utilities.getTileDelivery(delivery);
+        }
+
+        @Override
+        public FlipTileNotification build() {
+            return new FlipTileNotification(this, this.headers);
+        }
+        
+        public byte[] toByteArray() {
+            StringBuilder sb = new StringBuilder();
+            sb.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
+            sb.append("<wp:Notification xmlns:wp=\"WPNotification\">");
+            sb.append("<wp:Tile");
+            if( tileId != null ) {
+                sb.append(" Id=\"");
+                sb.append(tileId);
+                sb.append("\"");
+            }
+            sb.append(" Template=\"FlipTile\">");
+            if( isClear ) {
+            	sb.append(xmlElementClear("SmallBackgroundImage", smallBackgroundImage));
+            } else {
+            	sb.append(xmlElement("SmallBackgroundImage", smallBackgroundImage));
+            }
+            sb.append(xmlElementClear("WideBackgroundImage", wideBackgroundImage));
+            sb.append(xmlElementClear("WideBackBackgroundImage", wideBackBackgroundImage));
+            sb.append(xmlElementClear("WideBackContent", wideBackContent));
+            sb.append(xmlElementClear("BackgroundImage", backgroundImage));
+            sb.append(xmlElementClear("Count", ""+count));
+            sb.append(xmlElementClear("Title", title));
+            sb.append(xmlElementClear("BackBackgroundImage", backBackgroundImage));
+            sb.append(xmlElementClear("BackTitle", backTitle));
+            sb.append(xmlElementClear("BackContent", backContent));
+            sb.append("</wp:Tile>");
+            sb.append("</wp:Notification>");
+
+            return Utilities.toUTF8(sb.toString());
+        }
+    }
+}
diff --git a/src/main/java/com/notnoop/mpns/notifications/IconicTileNotification.java b/src/main/java/com/notnoop/mpns/notifications/IconicTileNotification.java
new file mode 100644
index 0000000..f245f39
--- /dev/null
+++ b/src/main/java/com/notnoop/mpns/notifications/IconicTileNotification.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2011, Mahmood Ali.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above
+ *     copyright notice, this list of conditions and the following disclaimer
+ *     in the documentation and/or other materials provided with the
+ *     distribution.
+ *   * Neither the name of Mahmood Ali. nor the names of its
+ *     contributors may be used to endorse or promote products derived from
+ *     this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * Contributed by vhong
+ */
+package com.notnoop.mpns.notifications;
+
+import static com.notnoop.mpns.internal.Utilities.xmlElement;
+import static com.notnoop.mpns.internal.Utilities.xmlElementClear;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map.Entry;
+
+import com.notnoop.mpns.DeliveryClass;
+import com.notnoop.mpns.MpnsNotification;
+import com.notnoop.mpns.internal.Utilities;
+
+public class IconicTileNotification implements MpnsNotification {
+	
+	private final Builder builder;
+	
+    private final List<? extends Entry<String, String>> headers;
+
+    protected IconicTileNotification(Builder builder, List<? extends Entry<String, String>> headers) {
+    	this.builder = builder;
+    	this.headers = headers;
+    }
+
+    public byte[] getRequestBody() {
+    	return this.builder.toByteArray();
+    }
+
+    public List<? extends Entry<String, String>> getHttpHeaders() {
+        return Collections.unmodifiableList(this.headers);
+    }
+
+    public static class Builder extends AbstractNotificationBuilder<Builder, IconicTileNotification> {
+        
+        private String tileId;
+        
+        private boolean isClear;
+        
+        private String smallIconImage;
+        private String iconImage;
+        private String wideContent1;
+        private String wideContent2;
+        private String wideContent3;
+        private int count;
+        private String title;
+        private String backgroundColor;
+
+        public Builder() {
+            super("token");
+            contentType(Utilities.XML_CONTENT_TYPE);
+        }
+        
+        public Builder tileId(String tileId) {
+        	this.tileId = tileId;
+        	return this;
+        }
+        
+        public Builder isClear(boolean clear) {
+        	this.isClear = clear;
+        	return this;
+        }
+
+        public Builder smallIconImage(String smallIconImage) {
+            this.smallIconImage = smallIconImage;
+            return this;
+        }
+
+        public Builder iconImage(String iconImage) {
+            this.iconImage = iconImage;
+            return this;
+        }
+
+        public Builder wideContent1(String wideContent1) {
+            this.wideContent1 = wideContent1;
+            return this;
+        }
+
+        public Builder wideContent2(String wideContent2) {
+            this.wideContent2 = wideContent2;
+            return this;
+        }
+
+        public Builder wideContent3(String wideContent3) {
+            this.wideContent3 = wideContent3;
+            return this;
+        }
+
+        public Builder count(int count) {
+            this.count = count;
+            return this;
+        }
+
+        public Builder title(String title) {
+            this.title = title;
+            return this;
+        }
+
+        public Builder backgroundColor(String backgroundColor) {
+            this.backgroundColor = backgroundColor;
+            return this;
+        }
+
+        @Override
+        protected int deliveryValueOf(DeliveryClass delivery) {
+            return Utilities.getTileDelivery(delivery);
+        }
+
+        @Override
+        public IconicTileNotification build() {
+            return new IconicTileNotification(this, this.headers);
+        }
+        
+        protected byte[] toByteArray() {
+            StringBuilder sb = new StringBuilder();
+            sb.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
+            sb.append("<wp:Notification xmlns:wp=\"WPNotification\">");
+            sb.append("<wp:Tile");
+            if( tileId != null ) {
+                sb.append(" Id=\"");
+                sb.append(tileId);
+                sb.append("\"");
+            }
+            sb.append(" Template=\"IconicTile\">");
+            if( isClear ) {
+            	sb.append(xmlElementClear("SmallIconImage", smallIconImage));
+            } else {
+            	sb.append(xmlElement("SmallIconImage", smallIconImage));
+            }
+            sb.append(xmlElementClear("IconImage", iconImage));
+            sb.append(xmlElementClear("WideContent1", wideContent1));
+            sb.append(xmlElementClear("WideContent2", wideContent2));
+            sb.append(xmlElementClear("WideContent3", wideContent3));
+            sb.append(xmlElementClear("Count", ""+count));
+            sb.append(xmlElementClear("Title", title));
+            sb.append(xmlElementClear("BackgroundColor", backgroundColor));
+            sb.append("</wp:Tile>");
+            sb.append("</wp:Notification>");
+
+            return Utilities.toUTF8(sb.toString());
+        }
+    }
+}
+
diff --git a/src/main/java/com/notnoop/mpns/notifications/TileNotification.java b/src/main/java/com/notnoop/mpns/notifications/TileNotification.java
index b384e00..4f91557 100644
--- a/src/main/java/com/notnoop/mpns/notifications/TileNotification.java
+++ b/src/main/java/com/notnoop/mpns/notifications/TileNotification.java
@@ -30,6 +30,8 @@
  */
 package com.notnoop.mpns.notifications;
 
+import static com.notnoop.mpns.internal.Utilities.xmlElement;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Map.Entry;
@@ -38,61 +40,30 @@
 import com.notnoop.mpns.MpnsNotification;
 import com.notnoop.mpns.internal.Utilities;
 
-import static com.notnoop.mpns.internal.Utilities.ifNonNull;
-import static com.notnoop.mpns.internal.Utilities.escapeXml;
-
 public class TileNotification implements MpnsNotification {
-    private final String backgroundImage;
-    private final String title;
-    private int count;
-
-    private final String backBackgroundImage;
-    private final String backTitle;
-    private final String backContent;
+    private final Builder builder;
 
     private final List<? extends Entry<String, String>> headers;
 
-    public TileNotification(String backgroundImage, String title, int count,
-            String backBackgroundImage, String backTitle, String backContent,
-            List<? extends Entry<String, String>> headers) {
-        this.backgroundImage = backgroundImage;
-        this.title = title;
-        this.count = count;
-
-        this.backBackgroundImage = backBackgroundImage;
-        this.backTitle = backTitle;
-        this.backContent = backContent;
-
-        this.headers = headers;
+    public TileNotification(Builder builder, List<? extends Entry<String, String>> headers) {
+    	this.builder = builder;
+    	this.headers = headers;
     }
 
     public byte[] getRequestBody() {
-        String tileMessage =
-            "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
-            "<wp:Notification xmlns:wp=\"WPNotification\">" +
-            "<wp:Tile>" +
-              ifNonNull(backgroundImage, "<wp:BackgroundImage>" + escapeXml(backgroundImage) + "</wp:BackgroundImage>") +
-              "<wp:Count>" + count + "</wp:Count>" +
-              ifNonNull(title, "<wp:Title>" + escapeXml(title) + "</wp:Title>") +
-              ifNonNull(backBackgroundImage, "<wp:BackBackgroundImage>" + escapeXml(backBackgroundImage) + "</wp:BackBackgroundImage>") +
-              ifNonNull(backTitle, "<wp:BackTitle>" + escapeXml(backTitle) + "</wp:BackTitle>") +
-              ifNonNull(backContent, "<wp:BackContent>" + escapeXml(backContent) + "</wp:BackContent>") +
-           "</wp:Tile> " +
-        "</wp:Notification>";
-
-        return Utilities.toUTF8(tileMessage);
+    	return this.builder.toByteArray();
     }
 
     public List<? extends Entry<String, String>> getHttpHeaders() {
         return Collections.unmodifiableList(this.headers);
     }
-
+    
     public static class Builder extends AbstractNotificationBuilder<Builder, TileNotification> {
         private String backgroundImage, title, backBackgroundImage, backTitle, backContent;
         private int count;
 
         public Builder() {
-            super("token"); // TODO: Check whether it is "tile"
+            super("token");
             contentType(Utilities.XML_CONTENT_TYPE);
         }
 
@@ -128,19 +99,29 @@ public Builder count(int count) {
 
         @Override
         protected int deliveryValueOf(DeliveryClass delivery) {
-            switch (delivery) {
-            case IMMEDIATELY:   return 1;
-            case WITHIN_450:    return 11;
-            case WITHIN_900:    return 21;
-            default:
-                throw new AssertionError("Unknown Value: " + delivery);
-            }
+            return Utilities.getTileDelivery(delivery);
         }
 
         @Override
         public TileNotification build() {
-            return new TileNotification(backgroundImage, title, count,
-                    backBackgroundImage, backTitle, backContent,headers);
+            return new TileNotification(this, headers);
+        }
+        
+        public byte[] toByteArray() {
+            StringBuilder sb = new StringBuilder();
+            sb.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
+            sb.append("<wp:Notification xmlns:wp=\"WPNotification\">");
+            sb.append("<wp:Tile>");
+            sb.append(xmlElement("BackgroundImage", backgroundImage));
+            sb.append(xmlElement("Count", ""+count));
+            sb.append(xmlElement("Title", title));
+            sb.append(xmlElement("BackBackgroundImage", backBackgroundImage));
+            sb.append(xmlElement("BackTitle", backTitle));
+            sb.append(xmlElement("BackContent", backContent));
+            sb.append("</wp:Tile>");
+            sb.append("</wp:Notification>");
+
+            return Utilities.toUTF8(sb.toString());
         }
     }
 }
diff --git a/src/main/java/com/notnoop/mpns/notifications/ToastNotification.java b/src/main/java/com/notnoop/mpns/notifications/ToastNotification.java
index 74df0db..a3765b4 100644
--- a/src/main/java/com/notnoop/mpns/notifications/ToastNotification.java
+++ b/src/main/java/com/notnoop/mpns/notifications/ToastNotification.java
@@ -38,42 +38,28 @@
 import com.notnoop.mpns.MpnsNotification;
 import com.notnoop.mpns.internal.Utilities;
 
-import static com.notnoop.mpns.internal.Utilities.ifNonNull;
 import static com.notnoop.mpns.internal.Utilities.escapeXml;
+import static com.notnoop.mpns.internal.Utilities.ifNonNull;
+import static com.notnoop.mpns.internal.Utilities.xmlElement;
 
 public class ToastNotification implements MpnsNotification {
-    private final String title;
-    private final String subtitle;
-    private final String parameter;
+    private final Builder builder;
 
     private final List<? extends Entry<String, String>> headers;
 
-    public ToastNotification(String title, String subtitle, String parameter,
+    public ToastNotification(Builder builder,
             List<? extends Entry<String, String>> headers) {
-        this.title = title;
-        this.subtitle = subtitle;
-        this.parameter = parameter;
-
+        this.builder = builder;
         this.headers = headers;
     }
 
-    public byte[] getRequestBody() {
-        String message =
-            "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
-            "<wp:Notification xmlns:wp=\"WPNotification\">" +
-               "<wp:Toast>" +
-                    ifNonNull(title, "<wp:Text1>" + escapeXml(title) + "</wp:Text1>") +
-                    ifNonNull(subtitle, "<wp:Text2>" + escapeXml(subtitle) + "</wp:Text2>") +
-                    ifNonNull(parameter, "<wp:Param>" + escapeXml(parameter) + "</wp:Param>") +
-               "</wp:Toast> " +
-            "</wp:Notification>";
-
-        return Utilities.toUTF8(message);
-    }
-
     public List<? extends Entry<String, String>> getHttpHeaders() {
         return Collections.unmodifiableList(this.headers);
     }
+    
+    public byte[] getRequestBody() {
+    	return this.builder.toByteArray();
+    }
 
     public static class Builder extends AbstractNotificationBuilder<Builder, ToastNotification> {
         private String title, subtitle, parameter;
@@ -100,18 +86,35 @@ public Builder parameter(String parameter) {
 
         @Override
         protected int deliveryValueOf(DeliveryClass delivery) {
+        	if( delivery == null ) {
+        		delivery = DeliveryClass.IMMEDIATELY;
+        	}
             switch (delivery) {
             case IMMEDIATELY:   return 2;
             case WITHIN_450:    return 12;
             case WITHIN_900:    return 22;
-            default:
-                throw new AssertionError("Unknown Value: " + delivery);
+            default:            return 2; // IMMEDIATELY is the default
             }
         }
 
         @Override
         public ToastNotification build() {
-            return new ToastNotification(title, subtitle, parameter, headers);
+            return new ToastNotification(this, headers);
         }
+        
+        public byte[] toByteArray() {
+            StringBuilder sb = new StringBuilder();
+            sb.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
+            sb.append("<wp:Notification xmlns:wp=\"WPNotification\">");
+            sb.append("<wp:Toast>");
+        	sb.append(xmlElement("Text1", title));
+        	sb.append(xmlElement("Text2", subtitle));
+        	sb.append(xmlElement("Param", parameter));
+            sb.append("</wp:Tile>");
+            sb.append("</wp:Notification>");
+            
+            return Utilities.toUTF8(sb.toString());
+        }
+
     }
 }
diff --git a/src/test/java/com/notnoop/mpns/MPNSTest.java b/src/test/java/com/notnoop/mpns/MPNSTest.java
index 16c080c..056ea15 100644
--- a/src/test/java/com/notnoop/mpns/MPNSTest.java
+++ b/src/test/java/com/notnoop/mpns/MPNSTest.java
@@ -31,6 +31,11 @@
 package com.notnoop.mpns;
 
 import org.junit.Test;
+
+import com.notnoop.mpns.MPNS;
+import com.notnoop.mpns.MpnsNotificationBuilder;
+import com.notnoop.mpns.MpnsServiceBuilder;
+
 import static org.junit.Assert.*;
 import static org.hamcrest.CoreMatchers.*;
 
diff --git a/src/test/java/com/notnoop/mpns/notifications/TileNotificationTest.java b/src/test/java/com/notnoop/mpns/notifications/TileNotificationTest.java
index e5e214b..f974ade 100644
--- a/src/test/java/com/notnoop/mpns/notifications/TileNotificationTest.java
+++ b/src/test/java/com/notnoop/mpns/notifications/TileNotificationTest.java
@@ -34,6 +34,7 @@
 import static org.junit.Assert.*;
 
 import com.notnoop.mpns.MPNS;
+import com.notnoop.mpns.notifications.TileNotification;
 
 import static com.notnoop.mpns.util.matches.IsValidXml.isValidXml;