Fix semantics and the return structure of the classes with no dictionary.