Table structure improvements