Updates to support Android Studio