ContextRework: ENUMS REFACTORING…