Updated with binary support