Better handling of custom vnd media types