Add binary support