Expand templates

From Meta Skate

Expand templates