diff --git a/CHANGELOG.md b/CHANGELOG.md
index 423638a71..090941a76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Optimizely Android X SDK Changelog
 
+## 2.0.0-beta6
+August 1st, 2018
+
+### Bug Fixes
+* Bump to Java SDK (2.1.2)[https://github.com/optimizely/java-sdk/releases/tag/2.1.2] which improves performance of API calls from.
+* Bring back async init without the datafile. (#211)
+
 ## 2.0.0-beta5
 July 23, 2018
 
diff --git a/build.gradle b/build.gradle
index 165b783f6..7a1855d18 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,7 +53,7 @@ ext {
     build_tools_version = "27.0.0"
     min_sdk_version = 14
     target_sdk_version = 26
-    java_core_ver = "2.1.1"
+    java_core_ver = "2.1.2"
     android_logger_ver = "1.3.6"
     support_annotations_ver = "24.2.1"
     junit_ver = "4.12"
diff --git a/event-handler/src/androidTest/java/com/optimizely/ab/android/event_handler/DefaultEventHandlerTest.java b/event-handler/src/androidTest/java/com/optimizely/ab/android/event_handler/DefaultEventHandlerTest.java
index 0f15e1a8f..1f4e8afe0 100644
--- a/event-handler/src/androidTest/java/com/optimizely/ab/android/event_handler/DefaultEventHandlerTest.java
+++ b/event-handler/src/androidTest/java/com/optimizely/ab/android/event_handler/DefaultEventHandlerTest.java
@@ -25,6 +25,7 @@
 import android.util.Pair;
 
 import com.optimizely.ab.event.LogEvent;
+import com.optimizely.ab.event.internal.payload.EventBatch;
 
 import org.junit.After;
 import org.junit.Before;
@@ -54,7 +55,6 @@ public class DefaultEventHandlerTest {
 
     private DefaultEventHandler eventHandler;
     private String url = "http://www.foo.com";
-    private String requestBody = "key1=val1&key2=val2&key3=val3";
 
     @Before
     public void setupEventHandler() {
@@ -68,20 +68,20 @@ public void setupEventHandler() {
 
     @Test
     public void dispatchEventSuccess() throws MalformedURLException {
-        eventHandler.dispatchEvent(new LogEvent(LogEvent.RequestMethod.POST, url, new HashMap<String, String>(), requestBody));
+        eventHandler.dispatchEvent(new LogEvent(LogEvent.RequestMethod.POST, url, new HashMap<String, String>(), new EventBatch()));
         //verify(context).startService(any(Intent.class));
         verify(logger).info("Sent url {} to the event handler service", "http://www.foo.com");
     }
 
     @Test
     public void dispatchEmptyUrlString() {
-        eventHandler.dispatchEvent(new LogEvent(LogEvent.RequestMethod.POST, "", new HashMap<String, String>(), requestBody));
+        eventHandler.dispatchEvent(new LogEvent(LogEvent.RequestMethod.POST, "", new HashMap<String, String>(), new EventBatch()));
         verify(logger).error("Event dispatcher received an empty url");
     }
 
     @Test
     public void dispatchEmptyParams() {
-        eventHandler.dispatchEvent(new LogEvent(LogEvent.RequestMethod.POST, url, new HashMap<String, String>(), requestBody));
+        eventHandler.dispatchEvent(new LogEvent(LogEvent.RequestMethod.POST, url, new HashMap<String, String>(), new EventBatch()));
         //verify(context).startService(any(Intent.class));
         verify(logger).info("Sent url {} to the event handler service", "http://www.foo.com");
     }
diff --git a/event-handler/src/test/java/com/optimizely/ab/android/event_handler/DefaultEventHandlerTest.java b/event-handler/src/test/java/com/optimizely/ab/android/event_handler/DefaultEventHandlerTest.java
index 12e800928..9a31991c2 100644
--- a/event-handler/src/test/java/com/optimizely/ab/android/event_handler/DefaultEventHandlerTest.java
+++ b/event-handler/src/test/java/com/optimizely/ab/android/event_handler/DefaultEventHandlerTest.java
@@ -20,6 +20,7 @@
 import android.content.Intent;
 
 import com.optimizely.ab.event.LogEvent;
+import com.optimizely.ab.event.internal.payload.EventBatch;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -45,7 +46,6 @@ public class DefaultEventHandlerTest {
 
     private DefaultEventHandler eventHandler;
     private String url = "http://www.foo.com";
-    private String requestBody = "key1=val1&key2=val2&key3=val3";
 
     @Before
     public void setupEventHandler() {
@@ -57,20 +57,20 @@ public void setupEventHandler() {
 
     @Test
     public void dispatchEventSuccess() throws MalformedURLException {
-        eventHandler.dispatchEvent(new LogEvent(LogEvent.RequestMethod.POST, url, new HashMap<String, String>(), requestBody));
+        eventHandler.dispatchEvent(new LogEvent(LogEvent.RequestMethod.POST, url, new HashMap<String, String>(), new EventBatch()));
         verify(context).startService(any(Intent.class));
         verify(logger).info("Sent url {} to the event handler service", "http://www.foo.com");
     }
 
     @Test
     public void dispatchEmptyUrlString() {
-        eventHandler.dispatchEvent(new LogEvent(LogEvent.RequestMethod.POST, "", new HashMap<String, String>(), requestBody));
+        eventHandler.dispatchEvent(new LogEvent(LogEvent.RequestMethod.POST, "", new HashMap<String, String>(), new EventBatch()));
         verify(logger).error("Event dispatcher received an empty url");
     }
 
     @Test
     public void dispatchEmptyParams() {
-        eventHandler.dispatchEvent(new LogEvent(LogEvent.RequestMethod.POST, url, new HashMap<String, String>(), requestBody));
+        eventHandler.dispatchEvent(new LogEvent(LogEvent.RequestMethod.POST, url, new HashMap<String, String>(), new EventBatch()));
         verify(context).startService(any(Intent.class));
         verify(logger).info("Sent url {} to the event handler service", "http://www.foo.com");
     }