PageContext refactoring