Updated with some MVC methods