Added support for data templates
Lint corrections