Updated Message structure