Implement more robust communication protocol