EMI-3: added templates for recent updates