Ported additional classes.