Changes to support Mongo