added raw statements around templates