Modified some classes.