Update to communication classes