Update api for 3.0.x compatibility