Category management refactored