Added support for operator field option