Added commuication handling