Add support for custom event args