Expand templates

From IAGSDCWiki
Expand templates