- Support new operators and fix