Add support for unpacking