Changed domain model