Chenged current_context management