Expand templates

From HF signals

Expand templates