- Improve event reference mechanism