Refactored predefined bundle constellations