More Codebook format changes.