Updated handling of new webservice response format