Added support for nesting in the values