Refactor & Add Logging Interceptor