Better communication handling