Issue: #7

  * Added switcher support