MVC improvments