Fix J2.5 extra fields compatible