Better management of table.