Added support for XC