Refactor pipe latest change.