Moved event validation to service class