Added support for dictionaries