Major updates for Android compatible code