Update to new model