EMI-2: added templates for recent updates