Mongo controller improvements