Add support for arbitrary content types and lengths.