Modifyng api response structure