CAL-658 Add missing keys