Fixed basic_message to handle current message structure