Extend the packing code to handle the rinse backend