Add support for operator module