Adding switch state tracker events