Update with MVC changes