Adding support of multiple MDBs