Shouldn't we fail if ds_name is None?