Added more classes in Templating module.

Preparation for coming conditional template tags.