Added new interceptor system