Made MessageID optional