model_wrapper is now bean, refactoring defaults