Updated ModelManager to match previous commit.