Use new mixin codegen