Improvement: Fix automatic resolution of dictionaries with complex objects

[majdisorder]

It seems like a dictionary with a simple key and complex value should be relatively easy to map automatically. Not sure if it should be done for dictionaries with complex keys.