Properly last change to domain model and modelclasses