Added support for Switchery