Expand templates

From RHIC Spin Group
Expand templates