trimmed categories and updated cpan mapping