Expand templates

From Labproto
Expand templates