Adjusted ContextHierarchy.