Add event manager
Refactoring form generator