Changed implementation of ContextualViewModelManager