Move data generators to util