Use new events API