Added columns into table and partition classes as there are no back references to table/partition from column classes
