Added MVC classes