Moving some template actions to a separate file