Add check for And, Or, Multi, Equal and variable type