Adding object type switcher