Second phase of migration: Android working