Refactored enums. Categories migration