Renamed DefaultStore to StoreImpl