context management refinements