Refactored distributions