Merged in some other classes.