Switched to JSONObject where that could be easily done