Updated context with stencil masks