JDK 1.7, completed v1 of data generator