diff --git a/src/com/google/android/gms/common/data/DataHolder.java b/src/com/google/android/gms/common/data/DataHolder.java
index ef5d89e..6ec81e9 100644
--- a/src/com/google/android/gms/common/data/DataHolder.java
+++ b/src/com/google/android/gms/common/data/DataHolder.java
@@ -1,11 +1,11 @@
 package com.google.android.gms.common.data;
 
 import org.microg.safeparcel.AutoSafeParcelable;
+import org.microg.safeparcel.SafeParceled;
 
-/**
- * TODO: usage
- */
 public class DataHolder extends AutoSafeParcelable {
+    @SafeParceled(1000)
+    private int versionCode = 1;
 
     public static final Creator<DataHolder> CREATOR = new AutoCreator<>(DataHolder.class);
 }
diff --git a/src/com/google/android/gms/people/internal/IPeopleCallbacks.aidl b/src/com/google/android/gms/people/internal/IPeopleCallbacks.aidl
index f1f0d5f..43d52a4 100644
--- a/src/com/google/android/gms/people/internal/IPeopleCallbacks.aidl
+++ b/src/com/google/android/gms/people/internal/IPeopleCallbacks.aidl
@@ -1,4 +1,7 @@
 package com.google.android.gms.people.internal;
 
+import com.google.android.gms.common.data.DataHolder;
+
 interface IPeopleCallbacks {
+    void onDataHolders(int code, in Bundle meta, in DataHolder[] data) = 3;
 }
diff --git a/src/com/google/android/gms/people/internal/IPeopleService.aidl b/src/com/google/android/gms/people/internal/IPeopleService.aidl
index 8c41d3a..15a17a3 100644
--- a/src/com/google/android/gms/people/internal/IPeopleService.aidl
+++ b/src/com/google/android/gms/people/internal/IPeopleService.aidl
@@ -4,32 +4,32 @@ import com.google.android.gms.people.internal.IPeopleCallbacks;
 import com.google.android.gms.common.server.FavaDiagnosticsEntity;
 
 interface IPeopleService {
-    void unknown1();
-    void loadOwners1(IPeopleCallbacks var1, boolean var2, boolean var3, String var4, String var5);
-    void loadCirclesOld(IPeopleCallbacks var1, String var2, String var3, String var4, int var5, String var6);
-    void loadPeopleOld(IPeopleCallbacks var1, String var2, String var3, String var4, in List<String> var5, int var6, boolean var7, long var8);
-    void loadAvatarLegacy(IPeopleCallbacks var1, String var2, int var3, int var4);
-    void loadContactImageLegacy(IPeopleCallbacks var1, long var2, boolean var4);
-    void blockPerson(IPeopleCallbacks var1, String var2, String var3, String var4, boolean var5);
-    Bundle syncRawContact(in Uri var1);
-    void loadPeopleForAggregation8(IPeopleCallbacks var1, String var2, String var3, String var4, boolean var5, int var6);
-    void setSyncToContactsSettings(IPeopleCallbacks var1, String var2, boolean var3, in String[] var4);
-    Bundle registerDataChangedListener(IPeopleCallbacks var1, boolean var2, String var3, String var4, int var5); 
-    Bundle startSync(String var1, String var2);
-    void requestSync(IPeopleCallbacks var1, String var2, String var3, in Uri var4);
-    void updatePersonCirclesOld(IPeopleCallbacks var1, String var2, String var3, String var4, in List<String> var5, in List<String> var6);
-    void a(boolean var1);
-    boolean isSyncToContactsEnabled();
-    Bundle requestSyncOld(String var1, String var2);
-    void setAvatar(IPeopleCallbacks var1, String var2, String var3, in Uri var4, boolean var5);
-    void loadCircles(IPeopleCallbacks var1, String var2, String var3, String var4, int var5, String var6, boolean var7);
-    Bundle requestSyncOld19(String var1, String var2, long var3);
-    void loadPeople20(IPeopleCallbacks var1, String var2, String var3, String var4, in List<String> var5, int var6, boolean var7, long var8, String var10, int var11);
-    void loadPeopleLive(IPeopleCallbacks var1, String var2, String var3, String var4, int var5, String var6);
-    void updatePersonCircles(IPeopleCallbacks var1, String var2, String var3, String var4, in List<String> var5, in List<String> var6, in FavaDiagnosticsEntity var7);
-    void loadRemoteImageLegacy(IPeopleCallbacks var1, String var2);
-    void loadContactsGaiaIds24(IPeopleCallbacks var1, String var2, String var3); 
-    Bundle requestSyncOld25(String var1, String var2, long var3, boolean var5); 
-    void addCircle(IPeopleCallbacks var1, String var2, String var3, String var4, String var5); 
-    void addPeopleToCircle(IPeopleCallbacks var1, String var2, String var3, String var4, in List<String> var5);
+    // void loadOwners1(IPeopleCallbacks var1, boolean var2, boolean var3, String var4, String var5);
+    // void loadCirclesOld(IPeopleCallbacks var1, String var2, String var3, String var4, int var5, String var6);
+    // void loadPeopleOld(IPeopleCallbacks var1, String var2, String var3, String var4, in List<String> var5, int var6, boolean var7, long var8);
+    // void loadAvatarLegacy(IPeopleCallbacks var1, String var2, int var3, int var4);
+    // void loadContactImageLegacy(IPeopleCallbacks var1, long var2, boolean var4);
+    // void blockPerson(IPeopleCallbacks var1, String var2, String var3, String var4, boolean var5);
+    // Bundle syncRawContact(in Uri var1);
+    // void loadPeopleForAggregation8(IPeopleCallbacks var1, String var2, String var3, String var4, boolean var5, int var6);
+    // void setSyncToContactsSettings(IPeopleCallbacks var1, String var2, boolean var3, in String[] var4);
+    // Bundle registerDataChangedListener(IPeopleCallbacks var1, boolean var2, String var3, String var4, int var5);
+    // Bundle startSync(String var1, String var2);
+    // void requestSync(IPeopleCallbacks var1, String var2, String var3, in Uri var4);
+    // void updatePersonCirclesOld(IPeopleCallbacks var1, String var2, String var3, String var4, in List<String> var5, in List<String> var6);
+    // boolean isSyncToContactsEnabled();
+    // Bundle requestSyncOld(String var1, String var2);
+    // void setAvatar(IPeopleCallbacks var1, String var2, String var3, in Uri var4, boolean var5);
+    // void loadCircles(IPeopleCallbacks var1, String var2, String var3, String var4, int var5, String var6, boolean var7);
+    // Bundle requestSyncOld19(String var1, String var2, long var3);
+    // void loadPeople20(IPeopleCallbacks var1, String var2, String var3, String var4, in List<String> var5, int var6, boolean var7, long var8, String var10, int var11);
+    // void loadPeopleLive(IPeopleCallbacks var1, String var2, String var3, String var4, int var5, String var6);
+    // void updatePersonCircles(IPeopleCallbacks var1, String var2, String var3, String var4, in List<String> var5, in List<String> var6, in FavaDiagnosticsEntity var7);
+    // void loadRemoteImageLegacy(IPeopleCallbacks var1, String var2);
+    // void loadContactsGaiaIds24(IPeopleCallbacks var1, String var2, String var3);
+    // Bundle requestSyncOld25(String var1, String var2, long var3, boolean var5);
+    // void addCircle(IPeopleCallbacks var1, String var2, String var3, String var4, String var5);
+    // void addPeopleToCircle(IPeopleCallbacks var1, String var2, String var3, String var4, in List<String> var5);
+
+    void loadOwners(IPeopleCallbacks callbacks, boolean var2, boolean var3, String var4, String var5, int var6) = 304;
 }
diff --git a/src/com/google/android/gms/people/model/AccountMetadata.java b/src/com/google/android/gms/people/model/AccountMetadata.java
new file mode 100644
index 0000000..943aac8
--- /dev/null
+++ b/src/com/google/android/gms/people/model/AccountMetadata.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2013-2015 µg Project Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.gms.people.model;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+import org.microg.safeparcel.SafeParceled;
+
+public class AccountMetadata extends AutoSafeParcelable {
+
+    @SafeParceled(1)
+    private int versionCode = 2;
+
+    public static Creator<AccountMetadata> CREATOR = new AutoCreator<>(AccountMetadata.class);
+}