Initial Changes for Android