Modify table construction