Added support for all operand types.