Added in a number of empty classes.