refactored to implement Filestore class and utilize inheritance on the AddressDataStore class