Lift 2.5 some refactor.