Finalised the domain model and context.