Changed structure of the response object and fixed urls.