WP-3844: Add support for better formats.