Add support for custom events
Type only needs to be determined for Standard Events