Update to use new PDDictionary functions.