Updated MVC class