New message protocol, refactor update.