Adding the ability to inject a custom HeaderFactory