Add packing support