Updated types for pipe