more changes to domain model and classes