Added handler interceptor implementation