Update for Lift 3.0-M2 (part ii)