Updated to work with new Razor engine