enhanced code generation for the operations