Updated domain model

Added some updates, more need to be made to align with Terry's
terminology for the glossary.