Updated to use security patched MVC