Removed pipes-safe, updated import statement