More work on ModelManager