Expand templates

From Barrel Wisdom
Expand templates