Fixing bugs in the Domain Model

Fixing bugs in the relationships between the entities belong to Domain
Model.