Completed porting to MVC 4