Implemented builder with the new building component.