Fixed DatasetGenerator and implemented Gardener