Fixed enum refactoring