Changes for Android client app