Moved custom CML class registration to pre cml instantiation