Interceptor refactoring