Updated domain model and migration scripts