Improvement of Switch Interface