C-MoR Support

Support for the use of the C-MoR modules is still very limited.