Changes to table.h added in previous commit