Added most workproducts and to their associated tasks