Improvements to the data generator for scale testing.