Added new version of Domain Model