Added a couple enumerators