Add MPC-BE + some refactoring