Expand templates

From OuroDev
Expand templates