Removed dependency on plumbing