Hey Andrew! And welcome back. I just want to inform you about something that might be of interest for you, we are planning to have a new return format from the server, List<KeyValue>, and the client has to make sense if it at its end, just so you know. Not sure if KeyValue is in trunk yet, but check it out on gitHub.
Regards Erik
