Convert collection to use new events
Use new events