Add revised Domain Model