Improving JSON for the Android app.