Handle extra switches