Finished refactoring of the base builder