Improved table handling in Table class