WIP
Rewrite of generated code
Test with nightly build