Add support for UNNEST

make this final