updated domain models