Migrate for 2.x compatibility