Issue #85 - Add missing keys