API change for 3.0.x