Make tables generic, part 2