Categorization optimized. Design improvements