Added Controller and Model classes