Dexterity 2.0.x compatibility