More updates for XPD