More refactoring of Base