Refactoring invariants for packaging - *untested* pushed for data redundancy