Updates for XC beta 7