Expand templates

From CRS EMS Guidelines
Expand templates