Changed CB plugin to work with CB2