Improve event validations