Expand templates

From Wicri Health
Expand templates