Additional template and header changes.