Added a few more events to be traced