Enhance Interceptor class