Updated to include new message protocol