Added more MVC stuff