ECMS-5468: Add missing keys (cont.)