Added some more templates
Update changes