Added some missing templates