Added some new templates