Edited TableGenerator