Split off table generation