Changes for the new binary kit