Additional template files and refinements