Added support for Dictionaries and Arrays