General cleanup
Comments import support for Mongodb