Updated MVC structure