Added KVO-compliance to switch