Added template
Fixed template data