XPM2 support