Expand templates

From Entropy
Expand templates