added data driven templates and data