Add base_component changes