Added a HandlerInterceptor