Add support for UNNEST

this should be in a finally block