More refactoring of base infrastructure