Updated category-management and counterparty-management features