Expanded the domain model