Improved Table Build