Expand templates

From CHITRAL
Expand templates