Revised template files