Improve special table generation