Improve support for binary data