Changes for Android Studio