Updated template defs