Moved AddressDataStore class to an external file