tweak to domain model