New interface for Android, continue refactroing