Adjust to removal of GlobalView
Advances for ContextViews