Merge "Split DataGenerator class for v2 and v3"