Add support for whole communication support