Refactory: fix templates.