Expand templates

From Bcontrol
Expand templates