Implementing support for custom headers
Updating how addresses are handled