Template feature catchup.