Continue transition to new models. (all tests pass)