diff --git a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerFactory.java b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerFactory.java
new file mode 100644
index 00000000..36978741
--- /dev/null
+++ b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerFactory.java
@@ -0,0 +1,11 @@
+package org.ifaa.android.manager;
+
+import android.compat.annotation.UnsupportedAppUsage;
+import android.content.Context;
+
+public class IFAAManagerFactory {
+    @UnsupportedAppUsage
+    public static IFAAManager getIFAAManager(Context context, int authType) {
+        return IFAAManagerImpl.getInstance(context);
+    }
+}
diff --git a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV2.java b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV2.java
new file mode 100644
index 00000000..d634ef0d
--- /dev/null
+++ b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV2.java
@@ -0,0 +1,9 @@
+package org.ifaa.android.manager;
+
+import android.compat.annotation.UnsupportedAppUsage;
+import android.content.Context;
+
+public abstract class IFAAManagerV2 extends IFAAManager {
+    @UnsupportedAppUsage
+    public abstract byte[] processCmdV2(Context paramContext, byte[] paramArrayOfByte);
+}
diff --git a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV3.java b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV3.java
new file mode 100644
index 00000000..328fd75b
--- /dev/null
+++ b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV3.java
@@ -0,0 +1,20 @@
+package org.ifaa.android.manager;
+
+import android.compat.annotation.UnsupportedAppUsage;
+
+public abstract class IFAAManagerV3 extends IFAAManagerV2 {
+    @UnsupportedAppUsage
+    public static final String KEY_FINGERPRINT_FULLVIEW = "org.ifaa.ext.key.CUSTOM_VIEW";
+    @UnsupportedAppUsage
+    public static final String KEY_GET_SENSOR_LOCATION = "org.ifaa.ext.key.GET_SENSOR_LOCATION";
+    @UnsupportedAppUsage
+    public static final String VALUE_FINGERPRINT_DISABLE = "disable";
+    @UnsupportedAppUsage
+    public static final String VLAUE_FINGERPRINT_ENABLE = "enable";
+
+    @UnsupportedAppUsage
+    public abstract String getExtInfo(int authType, String keyExtInfo);
+
+    @UnsupportedAppUsage
+    public abstract void setExtInfo(int authType, String keyExtInfo, String valExtInfo);
+}