Added some defaults in the templates