Added more variables to codebook.