More changes to adapt to new mongo_db and objectory