Add logic validation for events