Enhance doc for Events