Improvements for Event API.