Update for 2.1.x compatibility