Add server switch feature