Added support for Android