Better compatibility with Lights and Switches dashboard