Add missing switches methods (untested)