Cleaner handling of datasets