updated TableGenerator