UBL document types to be added in PRD2

Hello PSC and TSC,

In the UBL 2.1 PRD1 documentation it says:

    New document types expected for PRD2

       GoodsItemItinerary
       TransportServiceDescription
       CatalogueTemplate
       VirtualCompanyDossier

And also I have email from early 2010 to the effect that CPFR
wants to add

       PurchaseConditions

Two questions.

1. Is this list of five new document types correct and exhaustive?

2. Which doctypes go under which category?  Current categories of
    new 2.1 doctypes include:

    eTendering
    CPFR
    Sales reporting / VMI
    Intermodal Freight Management
    Utility billing

Jon