Added support for template calls to EQUALS