Refactor packing variants to 1c