Added support for Scene-switch