core/Functions update to templates