Add detection of missing keys