Expand templates

From psychmethods
Expand templates