Added some template customizations