Added more MVC classes