Fixed external template usage