First tranche of changes for Byteseek 2.0 integration