diff --git a/play-services-api/src/main/java/com/google/android/gms/people/internal/ParcelableLoadImageOptions.java b/play-services-api/src/main/java/com/google/android/gms/people/internal/ParcelableLoadImageOptions.java
new file mode 100644
index 00000000..cf7365f8
--- /dev/null
+++ b/play-services-api/src/main/java/com/google/android/gms/people/internal/ParcelableLoadImageOptions.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2013-2015 microG 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.internal;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+import org.microg.safeparcel.SafeParceled;
+
+public class ParcelableLoadImageOptions extends AutoSafeParcelable {
+    @SafeParceled(1000)
+    private int versionCode = 1;
+
+    @SafeParceled(1)
+    public int imageSize;
+
+    @SafeParceled(2)
+    public int avatarOptions;
+
+    @SafeParceled(3)
+    public boolean useLargePictureForCp2Images;
+
+    public static final Creator<ParcelableLoadImageOptions> CREATOR = new AutoCreator<ParcelableLoadImageOptions>(ParcelableLoadImageOptions.class);
+}
diff --git a/play-services-api/src/main/java/com/google/android/gms/people/model/AccountMetadata.java b/play-services-api/src/main/java/com/google/android/gms/people/model/AccountMetadata.java
index f14fcc56..0525d300 100644
--- a/play-services-api/src/main/java/com/google/android/gms/people/model/AccountMetadata.java
+++ b/play-services-api/src/main/java/com/google/android/gms/people/model/AccountMetadata.java
@@ -24,5 +24,17 @@ public class AccountMetadata extends AutoSafeParcelable {
     @SafeParceled(1)
     private int versionCode = 2;
 
+    @SafeParceled(2)
+    public boolean hasGooglePlus = true;
+
+    @SafeParceled(3)
+    public boolean hasFeature2 = true;
+
+    @SafeParceled(4)
+    public boolean hasFeature3 = true;
+
+    @SafeParceled(5)
+    public boolean hasFeature4 = true;
+
     public static Creator<AccountMetadata> CREATOR = new AutoCreator<AccountMetadata>(AccountMetadata.class);
 }
diff --git a/play-services-api/src/main/java/com/google/android/gms/people/model/AvatarReference.java b/play-services-api/src/main/java/com/google/android/gms/people/model/AvatarReference.java
new file mode 100644
index 00000000..03599139
--- /dev/null
+++ b/play-services-api/src/main/java/com/google/android/gms/people/model/AvatarReference.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2013-2015 microG 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 AvatarReference extends AutoSafeParcelable {
+
+    @SafeParceled(1000)
+    private int versionCode;
+
+    @SafeParceled(1)
+    public int source;
+
+    @SafeParceled(2)
+    public String location;
+
+    public static final Creator<AvatarReference> CREATOR = new AutoCreator<AvatarReference>(AvatarReference.class);
+}