[AddressBook]: Improvement