Primitives refactor operator definition