Expand templates

From Libertatem

Expand templates