Use new events system
Merge with origin
Remove exposed ondata method