Add support for passing in the current model when processing data-on.