Updated categorization