Interceptors initial commit
Refactoring