Make tables generic, part 3