Added more functions for Android