Added some more templates