Packs refactored