Refactoring maxcubebridge