Update to a MVC architecture