Refined domain model