Add support for custom attributes in events