Expand templates

From Mechsolve
Expand templates