Updated Switch object