Added New Template functionality