Make Mongodb changes backwards compatible #583 #588