Modified generate table to add the column data type