More refactoring to use request context proplist