Revert "Removed unnecessary templates"

This reverts commit d6b7a944c386614a4f934def101df133b59837dc.