Expand templates

From raju

Expand templates