Changes to the class design.