Make tables generic, part 4