Updates to table handling