ENH: Improving sample dataset tracking