Expand templates

From Sinchon

Expand templates