Updated Model classes