Make tables generic, part 1