some changes in parseTableGenerator