Added light on/off state control