Yes, I'd prefer to do this with the custom event classes. I'm working on this for the resource refactoring PR.