Refactoring.
Added support for CViewContexts.