New AndroidStudio compat