Better handling of the extra value in extras so we can tell core-datasets from non-coredatasets