IIRC there was still no DataGenerator class when I did the QDA example.

It would be great if you can update both of them.