Added new operator dedicated code