Updated domain objects according to new version of the api