added further support for mongoDb