Tagging the updates to the dictionary handling code. Fixing the CI build issues encountered recently.
