Refactor Classes to Enum