Updated event validation