CodeBook tweaks for the dictionary