Add new template tags

Provide example of advanced usage
Rename methods