FIX Do now allow arbitary class creation in CMS

Seperate PR coming for 3.1/master