Changes to some classes