Added ability to override tempalte_name