Add more information in templates

Improves #4