Added monitoring for more events