Merged some old classes.