WIP: make plugin works with C::B