Changing BaseSwitch to use the right ComponentType