Added binary data support