Handlers now handle in two steps the generation
Cleanup after refactoring