Replaced java configuration with an Android one