Sync up code with actual rest service.