Expand templates

From FixMyIONIQ
Expand templates