Add default blocks in switch statements
Modify templates for generated code