Handle binary data better.