Expand templates

From Bravo Fleet
Expand templates