Added DictionaryA2 TODO comments