Added MVC pattern