refactored to use AddressDataStore class