Updated data templates

Taken from prod site.