Added a couple of enum classes.