Updated FileTemplates to support ST2 and ST3