Expand templates

From International Center for Computational Logic
Expand templates