Modularize switch connection