Changed RequestDecorator to RequestInterceptor