Updates for XC6