Additional fixes from code review
Add high-level events for Ralf