build: table builder updates and refactoring