Added additional classes.