Switching functionalities, add scene and more control