D.Viscuso updated domain model