Updated MVC Model