Title: Simplified plumbing