More documentation
Templating comments