[Data generation] Updated structure