Added MVC paradigm