AddressEntryAndVerify refactoring