Refactoring to allow adding request content easily