Adding support for MongoBD fixes