Code refactor and adding tracing interceptors to executor