Made some changes to the domain models