Improved Razor support fields wrappers