Improve event monitoring/callbacks