Added support for JSON dictionary