Adding functionality back to AddressListService