Adapted code to latest 2.8 changes.

Relates to removal of AbstractEvent