* Better handle octet stream case * Use data source config stack options * Use immutability helper --------- Co-authored-by: Igor Octaviano <igoroctaviano@gmail.com> Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>