Latest android refactorings