Added message structure stuff