added some new classes to domain model