refactoring HeaderAddress to AddressHeader