fixed datagen to match server schema