Added MVC functionality