Added more data generator
Added more defs
defs