Removed WarcraftEnum and refactoring