diff --git a/examples/hellobaku/android/app/build.gradle b/examples/hellobaku/android/app/build.gradle
index 34455ee..0669b78 100644
--- a/examples/hellobaku/android/app/build.gradle
+++ b/examples/hellobaku/android/app/build.gradle
@@ -28,7 +28,7 @@
 }
 
 dependencies {
-    compile 'io.v:baku-toolkit:0.6.0'
+    compile 'io.v:baku-toolkit:0.7.0'
     compile fileTree(dir: 'libs', include: ['*.jar'])
     apk ('org.slf4j:slf4j-android:1.7.12')
 }
diff --git a/examples/hellobaku/android/app/src/main/java/io/v/baku/hellobaku/HelloActivityALaCarte.java b/examples/hellobaku/android/app/src/main/java/io/v/baku/hellobaku/HelloActivityALaCarte.java
index 7b2e2e7..1dd1a0b 100644
--- a/examples/hellobaku/android/app/src/main/java/io/v/baku/hellobaku/HelloActivityALaCarte.java
+++ b/examples/hellobaku/android/app/src/main/java/io/v/baku/hellobaku/HelloActivityALaCarte.java
@@ -10,13 +10,13 @@
 import io.v.baku.toolkit.VAndroidContextMixin;
 import io.v.baku.toolkit.VAndroidContextTrait;
 import io.v.baku.toolkit.bind.SyncbaseBinding;
-import io.v.rx.syncbase.GlobalUserSyncgroup;
+import io.v.rx.syncbase.RxAndroidSyncbase;
 import io.v.rx.syncbase.RxDb;
-import io.v.rx.syncbase.RxSyncbase;
+import io.v.rx.syncbase.UserSyncgroup;
 import rx.Subscription;
 
 public class HelloActivityALaCarte extends Activity {
-    private RxSyncbase mSb;
+    private RxAndroidSyncbase mSb;
     private Subscription mActivityDataBindings;
 
     @Override
@@ -27,7 +27,7 @@
         final VAndroidContextTrait<HelloActivityALaCarte> vActivity =
                 VAndroidContextMixin.withDefaults(this, savedInstanceState);
 
-        mSb = new RxSyncbase(vActivity);
+        mSb = new RxAndroidSyncbase(vActivity);
         final RxDb db = mSb.rxApp("app").rxDb("db");
 
         // We want these data bindings to share the lifecycle of the Activity from onCreate to
@@ -42,12 +42,12 @@
 
                 .getAllBindings();
 
-        GlobalUserSyncgroup.builder()
+        UserSyncgroup.builder()
                 .activity(vActivity)
-                .syncbase(mSb).db(db)
+                .db(db)
                 .prefix("t")
                 .sgSuffix("myGlobalUserSyncgroup")
-                .build()
+                .buildCloud()
                 .join();
     }
 
diff --git a/examples/hellobaku/android/build.gradle b/examples/hellobaku/android/build.gradle
index 73d24ea..15c2350 100644
--- a/examples/hellobaku/android/build.gradle
+++ b/examples/hellobaku/android/build.gradle
@@ -6,7 +6,7 @@
     }
     dependencies {
         classpath (
-                'com.android.tools.build:gradle:1.3.1',
+                'com.android.tools.build:gradle:1.5.0',
                 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
         )
 
