Support message and message_id so it is not so confusing