Updates for AndroidStudio