Updated the builder base for the different components.