Expand templates

From Cielo HRMs

Expand templates