Update to handle changes on the API