Model classes modified