Expand templates

From ppooll
Expand templates