RequestEntry refactoring