Updated to allow v4 and v5 of CBFS to co-exist.