Updated domain model 2.