Expand templates

From NHRL
Expand templates