Updated to support objects and arrays using the new syntax"