Changed extends of some classes.