Switched to use the operator module for the operator methods