Add message_format param