Use Xcore instead of Ecore for CMML