Mongosupport enhancements