Add a few steps
Add event name validation