Add data rendering to templates