Whole code change to some classes.