More refactoring of lift