Categorization improvements.