Updates to abstract.class.dictionary.class and unit tests