Added some enumerators