Added optimizations to table.