Adding support for unpacking maps