Changed specific data to template data