Updated to new communications model