Updated to account for new message types