Improved JSON response format. Also, token is now only returned during authentication.