Re: Refactor communication infra