Updated Domain Model