FIX Do now allow arbitary class creation in CMS

Merge into master please