Expand templates

From Klinilycs
Expand templates