Added support for
-getDictionaryAsMap
-getDictionaryAsSet