Added code generation classes