Added forgotten new classes.