Improve the model interface (work in progress).