Added feature: enable/disable for scenes and controller