Simplify pack state management