Minor changes to mongo models and schemas