Refactor/model_and_operators