Added model classes for domain objects