Migrating ModelSelector.
More work on ModelSelector.