Use new classes.