More types for generator
Add more types generator
Generate helper files to build tree
Change module definitions