Updated enumerations and event interface signature.