Added more details to domain model