Changes some classes and constructors.