#48 Updated code generation implementation.