Changes to support PageExecutionContext in Razor