Refined the domain model with several domain classes