Refactor AddressEntry