diff --git a/README.md b/README.md
index f84b5f9..0f49e69 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ maven {
 
 ## Version History
 
-The latest release of the SDK is `0.4.0`. Details about the current and past releases can be found in the [Releases](https://github.com/moonsense/moonsense-android-sdk/releases) section.
+The latest release of the SDK is `0.5.0`. Details about the current and past releases can be found in the [Releases](https://github.com/moonsense/moonsense-android-sdk/releases) section.
 
 
 ## Integration
diff --git a/buildSrc/src/main/java/AppConfig.kt b/buildSrc/src/main/java/AppConfig.kt
index 69a2109..523258a 100644
--- a/buildSrc/src/main/java/AppConfig.kt
+++ b/buildSrc/src/main/java/AppConfig.kt
@@ -8,7 +8,7 @@ object AppConfig {
     const val minSdkVersion = 16
     const val targetSdkVersion = 31
     const val versionCode = 1
-    const val versionName = "0.4.0"
+    const val versionName = "0.5.0"
     const val buildToolsVersion = "30.0.3"
     const val androidTestInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     const val jvmTarget = "11"
diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
index 37787d1..e1e3e5e 100644
--- a/buildSrc/src/main/java/Versions.kt
+++ b/buildSrc/src/main/java/Versions.kt
@@ -4,7 +4,7 @@
  */
 
 object Versions {
-    const val gradleTools = "7.1.3"
+    const val gradleTools = "7.2.1"
     const val kotlinVersion = "1.6.21"
     const val junit = "4.13.2"
     const val junitAndroidX = "1.1.3"
diff --git a/sample-app/src/main/java/io/moonsense/sdk/sample/MainActivity.kt b/sample-app/src/main/java/io/moonsense/sdk/sample/MainActivity.kt
index b2b9381..6ec3e66 100644
--- a/sample-app/src/main/java/io/moonsense/sdk/sample/MainActivity.kt
+++ b/sample-app/src/main/java/io/moonsense/sdk/sample/MainActivity.kt
@@ -12,7 +12,6 @@ import android.widget.TextView
 import android.widget.Toast
 import io.moonsense.sdk.Moonsense
 import io.moonsense.sdk.callback.MoonsenseCallback
-import io.moonsense.sdk.exception.MoonsenseException
 import io.moonsense.sdk.model.Session
 import java.util.concurrent.TimeUnit
 
@@ -22,7 +21,7 @@ internal class MainActivity : Activity() {
     private var sessionCount = 0
 
     private val moonsenseCallback = object : MoonsenseCallback {
-        override fun onError(ex: MoonsenseException) {
+        override fun onError(ex: Exception) {
             Toast.makeText(
                 this@MainActivity,
                 "Error: msg (${ex.message})",
diff --git a/sample-core-app/src/main/java/io/moonsense/sdk/core/sample/sdk/AcmeSdk.kt b/sample-core-app/src/main/java/io/moonsense/sdk/core/sample/sdk/AcmeSdk.kt
index 5aa12ae..be97ce6 100644
--- a/sample-core-app/src/main/java/io/moonsense/sdk/core/sample/sdk/AcmeSdk.kt
+++ b/sample-core-app/src/main/java/io/moonsense/sdk/core/sample/sdk/AcmeSdk.kt
@@ -10,9 +10,8 @@ import android.util.Log
 import io.moonsense.models.v2.Bundle
 import io.moonsense.sdk.Moonsense
 import io.moonsense.sdk.callback.MoonsenseCoreCallback
-import io.moonsense.sdk.config.SDKConfig
+import io.moonsense.sdk.config.SDKCoreConfig
 import io.moonsense.sdk.config.SensorType
-import io.moonsense.sdk.exception.MoonsenseException
 import io.moonsense.sdk.model.Session
 import okhttp3.HttpUrl
 import retrofit2.Call
@@ -73,7 +72,7 @@ class AcmeSdk(context: Context) {
             uploadData(acmeRequest)
         }
 
-        override fun onError(ex: MoonsenseException) {
+        override fun onError(ex: Exception) {
             Log.e(TAG, "Moonsense error reported $ex", ex)
         }
 
@@ -111,7 +110,7 @@ class AcmeSdk(context: Context) {
     init {
         Moonsense.initialize(
             context,
-            SDKConfig(
+            SDKCoreConfig(
                 // generate a bundle every second,
                 bundleGenerationInterval = ONE_SECOND_IN_MILLIS,
                 // only record accelerometer data
diff --git a/sample-payment-sdk/src/main/java/io/moonsense/sample/payment/sdk/Payment.kt b/sample-payment-sdk/src/main/java/io/moonsense/sample/payment/sdk/Payment.kt
index 52f6699..b3c091c 100644
--- a/sample-payment-sdk/src/main/java/io/moonsense/sample/payment/sdk/Payment.kt
+++ b/sample-payment-sdk/src/main/java/io/moonsense/sample/payment/sdk/Payment.kt
@@ -11,7 +11,6 @@ import io.moonsense.sdk.Moonsense
 import io.moonsense.sdk.callback.MoonsenseCallback
 import io.moonsense.sdk.config.SDKConfig
 import io.moonsense.sdk.config.SensorType
-import io.moonsense.sdk.exception.MoonsenseException
 import io.moonsense.sdk.model.Session
 
 /**
@@ -42,7 +41,7 @@ object Payment {
                 )
             ),
             moonsenseCallback = object : MoonsenseCallback {
-                override fun onError(ex: MoonsenseException) {
+                override fun onError(ex: Exception) {
                     Toast.makeText(
                         context,
                         "Error: msg (${ex.message})",