map interceptors revised