updated domain models to reflect database