Modified the Model classes