Refactor the integration with Restkit