Updated to Razor 2