Working on the code generation