Modified the model classes