Work on Android support
Initial Android support