Additional categorization improvements