Updated with domain model