refactoring service interceptor