Updated to CCA CS

see MetaModels/core#602