diff --git a/README.md b/README.md
index 1074653..be7e2ef 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Tealium Mobile Library for Android Version 5.0.3
+# Tealium Mobile Library for Android Version 5.0.4
 
 This mobile library leverages the power of Tealium's [TIQ™ Tag Management](http://tealium.com/products/tealium-iq-tag-management-system/), [AudienceStream™](http://tealium.com/products/audiencestream/) and [Data Access™](http://tealium.com/products/tealium-dataaccess/) products, or any combination of, making them natively available to Android applications. Please contact your Account Manager first to verify your agreement(s) for licensed products.
 
@@ -39,6 +39,10 @@ The Tealium DataAccess™ solution is a rich set of customer data services and f
 * If you have **account specific questions** please contact your Tealium account manager
 
 ## Change Log
+- 5.0.4
+    - Standardized Tealium Data Sources
+    - Added lifecycle_totalcrashcount to lifecycle module
+    - Fixed late initialization null pointer issue
 - 5.0.3
 	- Renamed OnMetricUpdateListener to MetricUpdateListener
 	- Fixed data clobbering bug
diff --git a/Samples/BlankApp+Tealium/app/build.gradle b/Samples/BlankApp+Tealium/app/build.gradle
index ef63111..00eba96 100644
--- a/Samples/BlankApp+Tealium/app/build.gradle
+++ b/Samples/BlankApp+Tealium/app/build.gradle
@@ -19,5 +19,5 @@ android {
 }
 
 dependencies {
-    compile(name:'tealium-5.0.3', ext:'aar')
+    compile(name:'tealium-5.0.4', ext:'aar')
 }
diff --git a/Samples/BlankApp+Tealium/app/libs/tealium-5.0.3.aar b/Samples/BlankApp+Tealium/app/libs/tealium-5.0.3.aar
deleted file mode 100644
index 9931535..0000000
Binary files a/Samples/BlankApp+Tealium/app/libs/tealium-5.0.3.aar and /dev/null differ
diff --git a/Samples/BlankApp+Tealium/app/libs/tealium-5.0.4.aar b/Samples/BlankApp+Tealium/app/libs/tealium-5.0.4.aar
new file mode 100644
index 0000000..1b89514
Binary files /dev/null and b/Samples/BlankApp+Tealium/app/libs/tealium-5.0.4.aar differ
diff --git a/Samples/ExampleApp+Tealium/app/build.gradle b/Samples/ExampleApp+Tealium/app/build.gradle
index e0a53ab..ccabf91 100644
--- a/Samples/ExampleApp+Tealium/app/build.gradle
+++ b/Samples/ExampleApp+Tealium/app/build.gradle
@@ -24,5 +24,5 @@ android {
 
 dependencies {
     compile 'com.android.support:support-v4:23.2.0'
-    compile(name:'tealium-5.0.3', ext:'aar')
+    compile(name:'tealium-5.0.4', ext:'aar')
 }
diff --git a/Samples/ExampleApp+Tealium/app/libs/tealium-5.0.3.aar b/Samples/ExampleApp+Tealium/app/libs/tealium-5.0.3.aar
deleted file mode 100644
index 9931535..0000000
Binary files a/Samples/ExampleApp+Tealium/app/libs/tealium-5.0.3.aar and /dev/null differ
diff --git a/Samples/ExampleApp+Tealium/app/libs/tealium-5.0.4.aar b/Samples/ExampleApp+Tealium/app/libs/tealium-5.0.4.aar
new file mode 100644
index 0000000..1b89514
Binary files /dev/null and b/Samples/ExampleApp+Tealium/app/libs/tealium-5.0.4.aar differ
diff --git a/Support/AndroidTV/Sample/app/build.gradle b/Support/AndroidTV/Sample/app/build.gradle
index 018a488..258aab7 100644
--- a/Support/AndroidTV/Sample/app/build.gradle
+++ b/Support/AndroidTV/Sample/app/build.gradle
@@ -26,5 +26,5 @@ dependencies {
     compile 'com.android.support:leanback-v17:23.1.1'
     compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.github.bumptech.glide:glide:3.4.0'
-    compile(name:'tealium-5.0.3', ext:'aar')
+    compile(name:'tealium-5.0.4', ext:'aar')
 }
diff --git a/Support/AndroidTV/Sample/app/libs/tealium-5.0.3.aar b/Support/AndroidTV/Sample/app/libs/tealium-5.0.3.aar
deleted file mode 100644
index 9931535..0000000
Binary files a/Support/AndroidTV/Sample/app/libs/tealium-5.0.3.aar and /dev/null differ
diff --git a/Support/AndroidTV/Sample/app/libs/tealium-5.0.4.aar b/Support/AndroidTV/Sample/app/libs/tealium-5.0.4.aar
new file mode 100644
index 0000000..1b89514
Binary files /dev/null and b/Support/AndroidTV/Sample/app/libs/tealium-5.0.4.aar differ
diff --git a/Support/AndroidWear/Sample/mobile/build.gradle b/Support/AndroidWear/Sample/mobile/build.gradle
index a5b0cb5..33e9372 100644
--- a/Support/AndroidWear/Sample/mobile/build.gradle
+++ b/Support/AndroidWear/Sample/mobile/build.gradle
@@ -25,6 +25,6 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.google.android.gms:play-services:8.3.0'
-    compile(name:'tealium-5.0.3', ext:'aar')
+    compile(name:'tealium-5.0.4', ext:'aar')
     compile(name:'tealium.mobile-5.0.1', ext:'aar')
 }
diff --git a/Support/AndroidWear/Sample/mobile/libs/tealium-5.0.3.aar b/Support/AndroidWear/Sample/mobile/libs/tealium-5.0.3.aar
deleted file mode 100644
index 9931535..0000000
Binary files a/Support/AndroidWear/Sample/mobile/libs/tealium-5.0.3.aar and /dev/null differ
diff --git a/Support/AndroidWear/Sample/mobile/libs/tealium-5.0.4.aar b/Support/AndroidWear/Sample/mobile/libs/tealium-5.0.4.aar
new file mode 100644
index 0000000..1b89514
Binary files /dev/null and b/Support/AndroidWear/Sample/mobile/libs/tealium-5.0.4.aar differ
diff --git a/Support/LifeCycle/MobileSample/app/build.gradle b/Support/LifeCycle/MobileSample/app/build.gradle
index fa15b17..a41fa04 100644
--- a/Support/LifeCycle/MobileSample/app/build.gradle
+++ b/Support/LifeCycle/MobileSample/app/build.gradle
@@ -20,6 +20,6 @@ android {
 
 dependencies {
     compile 'com.android.support:support-v4:23.2.0'
-    compile(name:'tealium-5.0.3', ext:'aar')
-    compile(name:'tealium.lifecycle-5.0.0', ext:'aar')
+    compile(name:'tealium-5.0.4', ext:'aar')
+    compile(name:'tealium.lifecycle-5.0.4', ext:'aar')
 }
diff --git a/Support/LifeCycle/MobileSample/app/libs/tealium-5.0.3.aar b/Support/LifeCycle/MobileSample/app/libs/tealium-5.0.3.aar
deleted file mode 100644
index 9931535..0000000
Binary files a/Support/LifeCycle/MobileSample/app/libs/tealium-5.0.3.aar and /dev/null differ
diff --git a/Support/LifeCycle/MobileSample/app/libs/tealium-5.0.4.aar b/Support/LifeCycle/MobileSample/app/libs/tealium-5.0.4.aar
new file mode 100644
index 0000000..1b89514
Binary files /dev/null and b/Support/LifeCycle/MobileSample/app/libs/tealium-5.0.4.aar differ
diff --git a/Support/LifeCycle/MobileSample/app/libs/tealium.lifecycle-5.0.0.aar b/Support/LifeCycle/MobileSample/app/libs/tealium.lifecycle-5.0.0.aar
deleted file mode 100644
index 0be215e..0000000
Binary files a/Support/LifeCycle/MobileSample/app/libs/tealium.lifecycle-5.0.0.aar and /dev/null differ
diff --git a/Support/LifeCycle/MobileSample/app/libs/tealium.lifecycle-5.0.4.aar b/Support/LifeCycle/MobileSample/app/libs/tealium.lifecycle-5.0.4.aar
new file mode 100644
index 0000000..076bec2
Binary files /dev/null and b/Support/LifeCycle/MobileSample/app/libs/tealium.lifecycle-5.0.4.aar differ
diff --git a/Support/LifeCycle/TVSample/app/build.gradle b/Support/LifeCycle/TVSample/app/build.gradle
index 3c546b6..ecaae40 100644
--- a/Support/LifeCycle/TVSample/app/build.gradle
+++ b/Support/LifeCycle/TVSample/app/build.gradle
@@ -26,6 +26,6 @@ dependencies {
     compile 'com.android.support:leanback-v17:23.1.1'
     compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.github.bumptech.glide:glide:3.4.0'
-    compile(name:'tealium-5.0.3', ext:'aar')
-    compile(name:'tealium.lifecycle-5.0.0', ext:'aar')
+    compile(name:'tealium-5.0.4', ext:'aar')
+    compile(name:'tealium.lifecycle-5.0.4', ext:'aar')
 }
diff --git a/Support/LifeCycle/TVSample/app/libs/tealium-5.0.3.aar b/Support/LifeCycle/TVSample/app/libs/tealium-5.0.3.aar
deleted file mode 100644
index 9931535..0000000
Binary files a/Support/LifeCycle/TVSample/app/libs/tealium-5.0.3.aar and /dev/null differ
diff --git a/Support/LifeCycle/TVSample/app/libs/tealium-5.0.4.aar b/Support/LifeCycle/TVSample/app/libs/tealium-5.0.4.aar
new file mode 100644
index 0000000..1b89514
Binary files /dev/null and b/Support/LifeCycle/TVSample/app/libs/tealium-5.0.4.aar differ
diff --git a/Support/LifeCycle/TVSample/app/libs/tealium.lifecycle-5.0.0.aar b/Support/LifeCycle/TVSample/app/libs/tealium.lifecycle-5.0.0.aar
deleted file mode 100644
index 0be215e..0000000
Binary files a/Support/LifeCycle/TVSample/app/libs/tealium.lifecycle-5.0.0.aar and /dev/null differ
diff --git a/Support/LifeCycle/TVSample/app/libs/tealium.lifecycle-5.0.4.aar b/Support/LifeCycle/TVSample/app/libs/tealium.lifecycle-5.0.4.aar
new file mode 100644
index 0000000..076bec2
Binary files /dev/null and b/Support/LifeCycle/TVSample/app/libs/tealium.lifecycle-5.0.4.aar differ
diff --git a/Support/LifeCycle/tealium.lifecycle-5.0.0.aar b/Support/LifeCycle/tealium.lifecycle-5.0.0.aar
deleted file mode 100644
index 0be215e..0000000
Binary files a/Support/LifeCycle/tealium.lifecycle-5.0.0.aar and /dev/null differ
diff --git a/Support/LifeCycle/tealium.lifecycle-5.0.4.aar b/Support/LifeCycle/tealium.lifecycle-5.0.4.aar
new file mode 100644
index 0000000..076bec2
Binary files /dev/null and b/Support/LifeCycle/tealium.lifecycle-5.0.4.aar differ
diff --git a/tealium-5.0.3.aar b/tealium-5.0.3.aar
deleted file mode 100644
index 9931535..0000000
Binary files a/tealium-5.0.3.aar and /dev/null differ
diff --git a/tealium-5.0.4.aar b/tealium-5.0.4.aar
new file mode 100644
index 0000000..1b89514
Binary files /dev/null and b/tealium-5.0.4.aar differ