Added class AddressDataStore and refactored