Re 1557 Reorganizing Mongo connections.