Refactored the Communication.