Add check for presense of all required keys