Updated event APIs