Enhance DataGenerator flexibility.