Improved the AddressBook XML structure