Adding support for multiple events per on/off call.