Refactor and add to Communication section