Added support for generic (typed) dictionaries