More mongo changes