A bit more work to support Android Studio