Enums refactoring