Added some more templates #1