Change zap_ds_store to a function