Updated Domain Model to represent changes from Issue #57