Added support for operators