Updated context and context variables