Update to structured messages and docs