ModelManager and fixes