* Updated enumerations to be singular