Improve message structure