Added support for dictionaries in compare tool