Template substitution possibility added