Modified the domain model to be more aligned to Abel's comments