Made changes to operator matching