Added TableGenerator