Changed implementation of updateModel