Upgraded to Lift 2.5 final version