TableUtils improvements