diff --git a/play-services-api/src/main/java/com/google/android/gms/auth/TokenData.java b/play-services-api/src/main/java/com/google/android/gms/auth/TokenData.java
new file mode 100644
index 00000000..e805db34
--- /dev/null
+++ b/play-services-api/src/main/java/com/google/android/gms/auth/TokenData.java
@@ -0,0 +1,64 @@
+/*
+ * 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.auth;
+
+import com.google.android.gms.common.api.Scope;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+import org.microg.safeparcel.SafeParceled;
+
+import java.util.List;
+
+public class TokenData extends AutoSafeParcelable {
+    @SafeParceled(1)
+    private int versionCode = 1;
+
+    @SafeParceled(2)
+    public final String token;
+
+    @SafeParceled(3)
+    public final Long expiry;
+
+    @SafeParceled(5)
+    public final boolean isOAuth;
+
+    @SafeParceled(value = 6, subClass = Scope.class)
+    public final List<Scope> scopes;
+
+    public TokenData() {
+        token = null;
+        expiry = null;
+        isOAuth = false;
+        scopes = null;
+    }
+
+    public TokenData(String token, Long expiry, boolean isOAuth, List<Scope> scopes) {
+        this.token = token;
+        this.expiry = expiry;
+        this.isOAuth = isOAuth;
+        this.scopes = scopes;
+    }
+
+    public TokenData(String token, Long expiry) {
+        this.token = token;
+        this.expiry = expiry;
+        this.isOAuth = false;
+        this.scopes = null;
+    }
+
+    public static final Creator<TokenData> CREATOR = new AutoCreator<TokenData>(TokenData.class);
+}
diff --git a/play-services-api/src/main/java/org/microg/gms/common/Constants.java b/play-services-api/src/main/java/org/microg/gms/common/Constants.java
index 6e1bd63e..6f0589bc 100644
--- a/play-services-api/src/main/java/org/microg/gms/common/Constants.java
+++ b/play-services-api/src/main/java/org/microg/gms/common/Constants.java
@@ -21,11 +21,12 @@ public class Constants {
      * This is the highest version that was looked at during development.
      * Does not necessarily mean anything.
      */
-    public static final int MAX_REFERENCE_VERSION = 8115000;
+    public static final int MAX_REFERENCE_VERSION = 8489000;
     public static final String KEY_MOCK_LOCATION = "mockLocation";
     public static final String DEFAULT_ACCOUNT = "<<default account>>";
     public static final String GMS_PACKAGE_NAME = "com.google.android.gms";
     public static final String GMS_PACKAGE_SIGNATURE_SHA1 = "38918a453d07199354f8b19af05ec6562ced5788";
+    public static final String SCOPE_GET_ACCOUNT_ID = "^^_account_id_^^";
 
     /**
      * No base map tiles.