Add templates, incomplete substitution