Add binary autodetection