Expand templates

From PCMCIA
Expand templates