Dataset is now more explicit about which structure it points to