Changed definitions to an enumeration.