Expand templates

From MEFD
Expand templates