Added some draft classes.