Modifications for indicating state of switch
Currently, there are no issues on this topic. Create one.