Updated the usage of enums