test1
added support for mongodb
fix merge conflicts