New API working. Also refactor instanceof Operator to make sense with new OperatorCode