Some changes to the dataset scheme