* Some first changes for Android support