More refactoring for easier extendability of the plumbing components