Changes to support for multiple OperAttr