Added switch accessors