Updated for 3.0.x