Fixed ArrayDictionary errors in Map