Minor refactoring to interceptors.