Updated domain models