Added binary support.