changed domain model