Reworked the AbstractTableBuilderFactory