Expand templates

From Machine Learning
Expand templates