Updates to dictionary handling