- Fixing the CS metamodel