RequestHeaders refactoring