Improved categories for companies and people