Adding dynamic template rendering