Add support for "local" packing