Adding support for global custom event args