Removed some unnecessary templates
Added validation for event time