Expand templates

From TRAP-RCUB

Expand templates