Updated to work with MVC 5