Improve mock interceptor