diff --git a/Android/.idea/caches/build_file_checksums.ser b/Android/.idea/caches/build_file_checksums.ser
index e8d578b..cf7e7e1 100644
Binary files a/Android/.idea/caches/build_file_checksums.ser and b/Android/.idea/caches/build_file_checksums.ser differ
diff --git a/Android/.vscode/settings.json b/Android/.vscode/settings.json
index c5f3f6b..e0f15db 100644
--- a/Android/.vscode/settings.json
+++ b/Android/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
-    "java.configuration.updateBuildConfiguration": "interactive"
+    "java.configuration.updateBuildConfiguration": "automatic"
 }
\ No newline at end of file
diff --git a/Android/notification-hubs-sdk-e2etestapp/.classpath b/Android/notification-hubs-sdk-e2etestapp/.classpath
new file mode 100644
index 0000000..c93a0dd
--- /dev/null
+++ b/Android/notification-hubs-sdk-e2etestapp/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Android/notification-hubs-sdk-e2etestapp/.project b/Android/notification-hubs-sdk-e2etestapp/.project
index 8c72ac6..babcae3 100644
--- a/Android/notification-hubs-sdk-e2etestapp/.project
+++ b/Android/notification-hubs-sdk-e2etestapp/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
@@ -12,6 +17,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>
diff --git a/Android/notification-hubs-sdk-e2etestapp/.settings/org.eclipse.jdt.core.prefs b/Android/notification-hubs-sdk-e2etestapp/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..35068d9
--- /dev/null
+++ b/Android/notification-hubs-sdk-e2etestapp/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/Android/notification-hubs-sdk-e2etestapp/build.gradle b/Android/notification-hubs-sdk-e2etestapp/build.gradle
index c0b6b51..9090cf4 100644
--- a/Android/notification-hubs-sdk-e2etestapp/build.gradle
+++ b/Android/notification-hubs-sdk-e2etestapp/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.microsoft.windowsazure.messaging.e2etestapp"
-        minSdkVersion 8
+        minSdkVersion 9
         targetSdkVersion 21
         versionCode 1
         versionName "1.0"
diff --git a/Android/notification-hubs-sdk-e2etestapp/notification-hubs-sdk-e2etestapp.iml b/Android/notification-hubs-sdk-e2etestapp/notification-hubs-sdk-e2etestapp.iml
index 8b75349..2cd5314 100644
--- a/Android/notification-hubs-sdk-e2etestapp/notification-hubs-sdk-e2etestapp.iml
+++ b/Android/notification-hubs-sdk-e2etestapp/notification-hubs-sdk-e2etestapp.iml
@@ -92,9 +92,16 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support:appcompat-v7-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-v4-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-annotations:21.0.3@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:appcompat-v7-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-fragment-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-annotations:25.3.1@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:animated-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-compat-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-v4-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-core-ui-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-media-compat-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-core-utils-25.3.1" level="project" />
     <orderEntry type="module" module-name="notification-hubs-sdk" exported="" />
   </component>
 </module>
\ No newline at end of file
diff --git a/Android/notification-hubs-sdk-e2etestapp/src/main/AndroidManifest.xml b/Android/notification-hubs-sdk-e2etestapp/src/main/AndroidManifest.xml
index eea3208..cde326b 100644
--- a/Android/notification-hubs-sdk-e2etestapp/src/main/AndroidManifest.xml
+++ b/Android/notification-hubs-sdk-e2etestapp/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
     <uses-permission android:name="android.permission.INTERNET"></uses-permission>
 
     <uses-sdk
-        android:minSdkVersion="8"
+        android:minSdkVersion="9"
         android:targetSdkVersion="17" />
 
     <application
diff --git a/Android/notification-hubs-sdk-tests/.classpath b/Android/notification-hubs-sdk-tests/.classpath
new file mode 100644
index 0000000..c93a0dd
--- /dev/null
+++ b/Android/notification-hubs-sdk-tests/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Android/notification-hubs-sdk-tests/.project b/Android/notification-hubs-sdk-tests/.project
index 21a728a..fda469b 100644
--- a/Android/notification-hubs-sdk-tests/.project
+++ b/Android/notification-hubs-sdk-tests/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
@@ -12,6 +17,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>
diff --git a/Android/notification-hubs-sdk-tests/.settings/org.eclipse.jdt.core.prefs b/Android/notification-hubs-sdk-tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..35068d9
--- /dev/null
+++ b/Android/notification-hubs-sdk-tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/Android/notification-hubs-sdk-tests/build.gradle b/Android/notification-hubs-sdk-tests/build.gradle
index 19b1b05..3110bb6 100644
--- a/Android/notification-hubs-sdk-tests/build.gradle
+++ b/Android/notification-hubs-sdk-tests/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion "21.1.2"
 
     defaultConfig {
-        minSdkVersion 8
+        minSdkVersion 9
         targetSdkVersion 21
         versionCode 1
         versionName "1.0"
diff --git a/Android/notification-hubs-sdk-tests/notification-hubs-sdk-tests.iml b/Android/notification-hubs-sdk-tests/notification-hubs-sdk-tests.iml
index 9807453..88f1bd7 100644
--- a/Android/notification-hubs-sdk-tests/notification-hubs-sdk-tests.iml
+++ b/Android/notification-hubs-sdk-tests/notification-hubs-sdk-tests.iml
@@ -86,9 +86,16 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support:appcompat-v7-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-v4-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-annotations:21.0.3@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:appcompat-v7-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-fragment-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-annotations:25.3.1@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:animated-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-compat-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-v4-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-core-ui-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-media-compat-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-core-utils-25.3.1" level="project" />
     <orderEntry type="module" module-name="notification-hubs-sdk" exported="" />
   </component>
 </module>
\ No newline at end of file
diff --git a/Android/notification-hubs-sdk/.classpath b/Android/notification-hubs-sdk/.classpath
new file mode 100644
index 0000000..c93a0dd
--- /dev/null
+++ b/Android/notification-hubs-sdk/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Android/notification-hubs-sdk/.project b/Android/notification-hubs-sdk/.project
index a2f9ece..fcd02d6 100644
--- a/Android/notification-hubs-sdk/.project
+++ b/Android/notification-hubs-sdk/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
@@ -12,6 +17,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>
diff --git a/Android/notification-hubs-sdk/.settings/org.eclipse.jdt.core.prefs b/Android/notification-hubs-sdk/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..35068d9
--- /dev/null
+++ b/Android/notification-hubs-sdk/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/Android/notification-hubs-sdk/build.gradle b/Android/notification-hubs-sdk/build.gradle
index 4d961cf..15f2dbb 100644
--- a/Android/notification-hubs-sdk/build.gradle
+++ b/Android/notification-hubs-sdk/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'maven'
 
-def version = 0.4
+def version = 0.5
 def PUBLISH_ARTIFACT_ID = 'notification-hubs-android-sdk'
 def groupId = 'com.microsoft.azure'
 
@@ -10,7 +10,7 @@ android {
     buildToolsVersion "21.1.2"
 
     defaultConfig {
-        minSdkVersion 8
+        minSdkVersion 9
         targetSdkVersion 21
         versionCode 1
         versionName "1.0"
diff --git a/Android/notification-hubs-sdk/notification-hubs-sdk.iml b/Android/notification-hubs-sdk/notification-hubs-sdk.iml
index f90014d..3f58f26 100644
--- a/Android/notification-hubs-sdk/notification-hubs-sdk.iml
+++ b/Android/notification-hubs-sdk/notification-hubs-sdk.iml
@@ -75,8 +75,15 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/25.3.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.3.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/25.3.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/25.3.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/25.3.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/25.3.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/25.3.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/25.3.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/25.3.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
@@ -85,12 +92,22 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/release" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
+      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support:appcompat-v7-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-v4-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-annotations:21.0.3@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:appcompat-v7-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-fragment-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-annotations:25.3.1@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:animated-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-compat-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-v4-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-core-ui-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-media-compat-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:support-core-utils-25.3.1" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/Android/notification-hubs-sdk/src/main/AndroidManifest.xml b/Android/notification-hubs-sdk/src/main/AndroidManifest.xml
index c6a161b..e869fdb 100644
--- a/Android/notification-hubs-sdk/src/main/AndroidManifest.xml
+++ b/Android/notification-hubs-sdk/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="8"
+        android:minSdkVersion="9"
         android:targetSdkVersion="17" />