updated domain model nouns