Reorder imports
Whitespace
Add support for additional fields in Http header