Add the message-format property

Also update decription