Adds better syntax detection in template.