Updated event definitions