Move to the correct message schema