Added new event fields and validation