Add categorization support