Improve event types validations