Changes to the interceptor context implementation