#1 Updated domain model