Prepare for next release
Add events
Add event API