Updated events validation
Updated events validation