Change API for XE12