Put app back in, and improved MongoDb support