Added support for other object types, EXCEPT event log