Changes needed to work with MongoDB