Added event validation