Added Model classes
Modified the model classes