Upgraded json response handling

Made the onComplete future task callback from AJRM a lot cleaner and now
reflects upgrade in json formatting on the server.