Modifications for Android Support