Updated for Android Query