Refactored pipes