Preparing to rewrite the model api.