Updated for XE16.