CDCDictionary moved to commons