Added more enumerators