Extract plumbing into Core assembly