fix the broken parts of the generator.
Improve handler/commands generation