Added support for SET and EQU