Partial update of table generation to data format generation 1.