Add Operand support, and all constants