Updates including compatibility with CBM4 and modularization