Optimize file templates, add new alternative template