Updated for Lift 3.0-M2