Updated interceptor'