Add awareness arithmetic operator support