Updated CodeFramework with Android