Expand templates

From ActinoBase
Expand templates