Added more enumeration