Expand templates

From AMMERSE
Expand templates