Changed the way the server response is parsed