Android implementation updated to new structure